Pick up missing pieces for Windows build of new jeeps layers.

diff --git a/gpsbabel/Makefile.in b/gpsbabel/Makefile.in
index 63abbd1851d858040374dc66b65a3b012f7e4d05..f48e7e5e48eaacace02a99acd0ab8e2851aeaf9e 100644 (file)
--- a/gpsbabel/Makefile.in
+++ b/gpsbabel/Makefile.in
@@ -3,7 +3,7 @@ VPATH = @srcdir@
 VERSU=1_2_8
 VERSD=1.2.8
 # YYYYMMDD, please, if beta.
-RELEASE=-beta20060405
+RELEASE=-beta20060420-ds
 VERSIONU=$(VERSU)$(RELEASE)
 VERSIOND=$(VERSD)$(RELEASE)
 

diff --git a/gpsbabel/jeeps/gpsserial.c b/gpsbabel/jeeps/gpsserial.c
index cfc97705437d4b95f6aa0be712ad26079d1ebe93..543766dd22932ccad93de90bd53c81c14245046c 100644 (file)
--- a/gpsbabel/jeeps/gpsserial.c
+++ b/gpsbabel/jeeps/gpsserial.c
@@ -57,7 +57,10 @@ char *rxdata[] = {
 #if defined (__WIN32__) || defined (__CYGWIN__)
 
 #include <windows.h>
-#include "gpsserial_win.h"
+
+typedef struct {
+        HANDLE comport;
+} win_serial_data;
 
 /*
  * Display an error from the serial subsystem.

diff --git a/gpsbabel/jeeps/gpsusbwin.c b/gpsbabel/jeeps/gpsusbwin.c
index b14ca2fd0c01e54facb7b5f5a324b94d38d75f73..c4c984e149ca8b83df7cec7bf2a0fb8f949b218f 100644 (file)
--- a/gpsbabel/jeeps/gpsusbwin.c
+++ b/gpsbabel/jeeps/gpsusbwin.c
@@ -32,7 +32,6 @@
 #include "gpsapp.h"
 #include "garminusb.h"
 #include "gpsusbcommon.h"
-#include "gpsusbwin.h"
 
 /* Constants from Garmin doc. */
 
@@ -50,6 +49,9 @@ DEFINE_GUID(GARMIN_GUID, 0x2c9c45c2L, 0x8e7d, 0x4c08, 0xa1, 0x2d, 0x81, 0x6b, 0x
 #define IOCTL_GARMIN_USB_BULK_OUT_PACKET_SIZE CTL_CODE \
        (FILE_DEVICE_UNKNOWN, 0x851, METHOD_BUFFERED, FILE_ANY_ACCESS)
 
+typedef struct {
+        int booger;
+} winusb_unit_data;
 
 static HANDLE *usb_handle = INVALID_HANDLE_VALUE;
 static int usb_tx_packet_size ;
@@ -202,7 +204,7 @@ gusb_init(const char *pname, gpsdevh **dh)
        gusb_register_ll(&win_llops);
 
        if (strlen(pname) > 4) {
-               if (0 == strcmp(portname+4, "list")) {
+               if (0 == strcmp(pname+4, "list")) {
                        req_unit_number = -1;
                } else {
                        req_unit_number = atoi(pname+4);

diff --git a/gpsbabel/route.c b/gpsbabel/route.c
index 65cae126465bbf7ac54aa4db085af3be6dc5436d..72685e0763eba1a30ca2b923422e102b6800dd4f 100644 (file)
--- a/gpsbabel/route.c
+++ b/gpsbabel/route.c
@@ -455,8 +455,8 @@ void track_recompute(route_head *trk)
        first.creation_time = 0;
 
        QUEUE_FOR_EACH((queue *)&trk->waypoint_list, elem, tmp) {
-               this = (waypoint *)elem;
                double tlat, tlon, plat, plon, dist;
+               this = (waypoint *)elem;
                /* gcdist and headin want radians, not degrees */
                tlat = RAD(this->latitude);
                tlon = RAD(this->longitude);